From af2302dbf58bbd84a04e7c689feb30e0adc0f1f1 Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Wed, 1 Jun 2011 11:11:43 +0100 Subject: [PATCH] x86/mm: mem-paging and mem-sharing only work with HAP so don't let the tools shoot themselves in the foot. Signed-off-by: Tim Deegan --- xen/arch/x86/mm/mem_paging.c | 4 ++++ xen/arch/x86/mm/mem_sharing.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/xen/arch/x86/mm/mem_paging.c b/xen/arch/x86/mm/mem_paging.c index be4823dd3f..f00a1a92a1 100644 --- a/xen/arch/x86/mm/mem_paging.c +++ b/xen/arch/x86/mm/mem_paging.c @@ -31,6 +31,10 @@ int mem_paging_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, int rc; struct p2m_domain *p2m = p2m_get_hostp2m(d); + /* Only HAP is supported */ + if ( !hap_enabled(d) ) + return -ENODEV; + switch( mec->op ) { case XEN_DOMCTL_MEM_EVENT_OP_PAGING_NOMINATE: diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index bd3ff6851d..bf1940dd65 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -737,6 +737,10 @@ int mem_sharing_domctl(struct domain *d, xen_domctl_mem_sharing_op_t *mec) { int rc; + /* Only HAP is supported */ + if ( !hap_enabled(d) ) + return -ENODEV; + switch(mec->op) { case XEN_DOMCTL_MEM_SHARING_OP_CONTROL: -- 2.30.2